From: Florian Müllner <fmuellner@gnome.org>
Date: Tue, 29 Mar 2011 14:32:00 +0000 (+0200)
Subject: end-session-dialog: Show default icon if user icon is unset
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~8388
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=af69945e5bb44042ac887531b30690d19f528512;p=gnome-shell.git

end-session-dialog: Show default icon if user icon is unset

If the user has not configured a user icon, the logout dialog will
display an empty rectangle. Show a default picture instead.

https://bugzilla.gnome.org/show_bug.cgi?id=646032
---

diff --git a/js/ui/endSessionDialog.js b/js/ui/endSessionDialog.js
index c019e2aaa..a10b86d00 100644
--- a/js/ui/endSessionDialog.js
+++ b/js/ui/endSessionDialog.js
@@ -366,8 +366,10 @@ EndSessionDialog.prototype = {
 
         if (this._user.is_loaded && !dialogContent.iconName) {
             let iconFile = this._user.get_icon_file();
-
-            this._setIconFromFile(iconFile, dialogContent.iconStyleClass);
+            if (GLib.file_test(iconFile, GLib.FileTest.EXISTS))
+                this._setIconFromFile(iconFile, dialogContent.iconStyleClass);
+            else
+                this._setIconFromName('avatar-default', dialogContent.iconStyleClass);
         } else if (dialogContent.iconName) {
             this._setIconFromName(dialogContent.iconName,
                                   dialogContent.iconStyleClass);